Update upstream source from tag 'upstream/2017.15'
authorSimon McVittie <smcv@debian.org>
Tue, 2 Jan 2018 11:53:51 +0000 (11:53 +0000)
committerSimon McVittie <smcv@debian.org>
Tue, 2 Jan 2018 11:53:51 +0000 (11:53 +0000)
Update to upstream version '2017.15'
with Debian dir ef2f4fe701dc5a1300596b48ac894280d7ae4856


Trivial merge